Darwin PMDA Phase 2: Apple Silicon metrics expansion

.cirrus.yml

@@ -37,6 +37,9 @@ task:
      [ "$PCP_SKIP_BUILD" == "true" ] && echo "SKIPPING BUILD" || ./Makepkgs --verbose
   start_valkey_script: |
      brew services start valkey
+  validate_pmid_consistency_script: |
+     echo "Validating PMID consistency across pmns, metrics.c, and darwin.h..."
+     ./build/mac/test/integration/test-pmid-consistency.sh
   pcp_install_script: |
      DMG_PATH=$(find pcp-**/build/mac -name "pcp-*.dmg" | head -1) # Find the generated DMG
      echo "Found DMG: $DMG_PATH"

.claude/agents/macos-darwin-pmda-qa.md

@@ -20,7 +20,13 @@ You are a macOS Darwin PMDA QA Automation Agent. Your sole responsibility is to
 1. **Verify Prerequisites**:
    - Confirm the host OS is macOS
    - Confirm changes were made to either @src/pmdas/darwin or @src/pmdas/darwin_proc
-   - If either condition fails, refuse to execute and explain why
+   - **CRITICAL**: Verify all relevant changes are committed to git
+   - Run `git status` to check for uncommitted changes in:
+     - `src/pmdas/darwin` or `src/pmdas/darwin_proc` (source code)
+     - `build/mac/` (test scripts, installer files)
+   - If uncommitted changes exist in any of these directories, STOP and instruct the user to commit first
+   - Explain: "The Tart VM clones the git repository - uncommitted changes are invisible to it"
+   - If any condition fails, refuse to execute and explain why
 
 2. **Execute Test Environment**:
    Run exactly this command:
@@ -80,7 +86,8 @@ Do NOT:
 ### On Invalid Invocation:
 If prerequisites aren't met, clearly state:
 - "Cannot execute: Host OS is not macOS" OR
-- "Cannot execute: No changes detected in @src/pmdas/darwin or @src/pmdas/darwin_proc directory"
+- "Cannot execute: No changes detected in @src/pmdas/darwin or @src/pmdas/darwin_proc directory" OR
+- "Cannot execute: Uncommitted changes detected in [directory]. Please commit changes first - the VM only sees committed code."
 
 ## Edge Cases
 

.claude/skills/macos-qa-test/SKILL.md

@@ -38,10 +38,24 @@ Run this command to execute the darwin PMDA QA tests:
 
 ## When to Use
 
-- After making changes to `src/pmdas/darwin` or `src/pmdas/darwin_proc`
-- Before committing darwin PMDA changes
-- To validate new metrics or bug fixes
-- When you want to ensure changes work in a clean environment
+- After making AND COMMITTING changes to `src/pmdas/darwin` or `src/pmdas/darwin_proc`
+- To validate new metrics or bug fixes in a clean environment
+- Before pushing changes to remote
+
+## CRITICAL: Git Commit Required
+
+**You MUST commit all source code changes to git BEFORE running this skill.**
+
+The Tart VM clones the git repository. Uncommitted local changes are INVISIBLE to the VM.
+
+```bash
+# Correct workflow:
+git add <changed-files>
+git commit -m "Add new metric for X"
+/macos-qa-test              # NOW the VM will see your changes
+```
+
+If tests fail on code you just wrote, verify you committed the changes first
 
 ---
 

.github/workflows/macOS.yml

@@ -37,6 +37,13 @@ jobs:
           source pybuilddeps/bin/activate
           xcodebuild -version
           ./Makepkgs -verbose
+      # Validate PMID consistency
+      - name: Validate PMID Consistency
+        id: pmid-validation
+        if: success()
+        run: |
+          echo "Validating PMID consistency across pmns, metrics.c, and darwin.h..."
+          ./build/mac/test/integration/test-pmid-consistency.sh
       # Darwin PMDA Unit Tests (pre-installation)
       - name: Run Darwin PMDA Unit Tests
         id: unit-tests

.gitignore

@@ -53,3 +53,4 @@ provisioning/osxsierra.legally.ok
 *vgcore.*
 tmpfiles.init.setup 
 
+/CLAUDE.local.md

CLAUDE.md

@@ -98,6 +98,10 @@ PMDAs collect metrics from specific subsystems. Key directories in `src/pmdas/`:
 - **libpcp_trace**: Event trace instrumentation
 - **libpcp_import**: Data import for PCP archives
 
+## Available Agents
+
+- `pcp-code-reviewer` - Reviews code against PCP project standards (whitespace, naming, structure, PCP patterns)
+
 ## Development Guidelines
 
 ### QA Testing Philosophy
@@ -138,3 +142,42 @@ cd qa && ./check -g archive # Archive tests
 
 ### Platform Support
 PCP supports Linux, macOS, Windows (MinGW), AIX, and Solaris. Tests should be written to be portable or use `_notrun()` for platform-specific limitations.
+
+## macOS Development (Darwin Platform Only)
+
+When developing on macOS (`Platform: darwin` in environment):
+
+### ⚠️ Critical Constraints
+
+1. **Stage changes before VM tests**
+   - The Tart VM accesses the filesystem directly — `git add` is the minimum required
+   - Unstaged changes in `src/pmdas/darwin*` AND `build/mac/` are INVISIBLE to the VM
+   - A full commit also works; either way, run `/macos-qa-test` after staging
+
+2. **Test environments**
+   - Unit tests: Run locally (no PCP needed)
+   - Integration tests: Tart VM only (`/macos-qa-test`)
+
+### macOS-Specific Agent
+
+- `macos-darwin-pmda-qa` - Runs integration tests in isolated Tart VM
+
+### Quick Start
+```bash
+./Makepkgs --verbose              # One-time: full build (5-30 min)
+cd build/mac/test && ./run-all-tests.sh  # Daily: build + test (20-30s)
+```
+
+### Key Directories
+
+| Directory | Purpose |
+|-----------|---------|
+| `build/mac/` | Test orchestration, PKG packaging, Tart VMs |
+| `dev/darwin/` | Quick-compile tools (~10s vs 30min) |
+| `src/pmdas/darwin/` | Darwin PMDA source code |
+| `src/pmdas/darwin_proc/` | Darwin process PMDA source |
+
+### Documentation
+
+- `build/mac/CLAUDE.md` - Development workflow, test commands
+- `build/mac/MACOS_DEVELOPMENT.md` - Tart VM clean-room builds

build/mac/README.md → build/mac/CLAUDE.md

@@ -2,6 +2,25 @@
 
 Fast iteration tools for Darwin PMDA development on macOS.
 
+## ⚠️ macOS Development Constraints
+
+1. **PCP is NOT installed locally** - Don't run `pminfo`/`pmval`/`pmprobe`. Read `src/pmdas/darwin/pmns` instead.
+2. **Commit before VM tests** - Tart VM only sees committed git changes.
+3. **Unit tests = local, Integration tests = VM only**
+
+### Git Commit Requirement
+
+**ALL changes MUST be committed to git BEFORE running Tart VM tests.**
+
+This includes:
+- Source code changes (`src/pmdas/darwin*`)
+- Build/test scripts in THIS directory (`build/mac/`)
+- Installation scripts, test fixtures, etc.
+
+The Tart VM clones the git repository - uncommitted local changes are invisible to it.
+
+---
+
 ## Prerequisites (One-Time Setup)
 
 PCP must be fully built before using quick builds:
@@ -15,7 +34,7 @@ This takes 5-30 minutes and only needs to be done once. It generates headers, bu
 
 **Verify setup:**
 ```bash
-cd dev/darwin/dev
+cd dev/darwin
 make check-deps
 ```
 
@@ -31,7 +50,7 @@ Builds PMDA (~5-10s) and runs unit tests (~10-20s). Runs integration tests if pm
 
 ### Build Only
 ```bash
-cd dev/darwin/dev
+cd dev/darwin
 make clean && make
 ```
 
@@ -52,11 +71,15 @@ cd build/mac/test
 ./run-unit-tests.sh
 ```
 
-**Integration tests** (requires PCP installed and pmcd running):
-```bash
-cd build/mac/test/integration
-./run-integration-tests.sh
-```
+**Integration tests** (Tart VM only - do NOT run locally):
+
+Integration tests require PCP installed and pmcd running. The Tart VM provides this environment.
+
+**Before running:**
+1. Commit all changes to git (source code AND build/mac scripts)
+2. Use `/macos-qa-test` skill or `macos-darwin-pmda-qa` agent
+
+The VM clones the git repo, so uncommitted changes are invisible
 
 ### Centralized Test Orchestration
 Quick test runners available in `build/mac/test/`:
@@ -68,7 +91,13 @@ Quick test runners available in `build/mac/test/`:
 
 1. Edit source: `src/pmdas/darwin/pmda.c`
 2. Update PMNS: `src/pmdas/darwin/pmns`
-3. Quick build: `cd dev/darwin/dev && make`
+3. Quick build: `cd dev/darwin && make`
 4. Add test: `src/pmdas/darwin/test/test-<cluster>.txt`
 5. Run tests: `cd build/mac/test && ./run-all-tests.sh`
 
+## Detailed Documentation
+
+For in-depth procedures and troubleshooting:
+- `MACOS_DEVELOPMENT.md` - Tart VM setup for clean-room builds
+- `qa/TESTING.md` - pmcd launchctl test plan
+